Tasks: Merging Branches

SECTION V: Merging Branches

Task Description:

Now that you have completed your work, your coworkers have meticulously reviewed the work on your branches, and you are ready to move forward with the changes, we have a few steps to take!

Task List:

Switch to the * master* branch, if you haven't already.

Pull the changes you and your coworkers might have made in the passing days (in this case, you won't have any updates, but pulling changes is often the first thing you do each day).

Since your changes are all ready to go, merge all the branches into the master. Address any merge conflicts. If you split up your work among your branches correctly, you should have no merge conflicts.

You should see a message that shows the changes to the files, insertions, and deletions.

Push the repository to your remote repository.

Go to GitHub. Notice that your master branch has all of the changes.

Answer all of the questions in the template and submit a pdf to be reviewed!

Task Feedback:

Great work! You completed all the tasks. Get the ** Git Commands Documentation** file ready for submission and you can proceed to the submission page.